Merge branch 'upstream-cvs' into experimental
authorBernd Zeimetz <bernd@bzed.de>
Wed, 28 Jan 2009 12:50:13 +0000 (13:50 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 28 Jan 2009 12:50:13 +0000 (13:50 +0100)

Trivial merge